Auto merge of #2440 - ThinTim:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 22 Mar 2016 16:52:21 +0000 (09:52 -0700)
committerbors <bors@rust-lang.org>
Tue, 22 Mar 2016 16:52:21 +0000 (09:52 -0700)
Prevent the use of "test" as a crate name

Fixes #2432

?r @alexcrichton


Trivial merge